ostree-tests: Depend on gjs on s390x again

mozjs and gjs are believed to work fine on s390x now.

diff --git a/debian/changelog b/debian/changelog
index 49698fc293a8ac8b19684b7a20e80e43766c87f6..d4ee241301feafb2db09304affadb3695dc49d9b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 ostree (2020.5-1) UNRELEASED; urgency=medium
 
   * New upstream release
+  * ostree-tests: Depend on gjs on s390x again.
+    mozjs and gjs are believed to work fine on s390x now.
 
  -- Simon McVittie <smcv@debian.org>  Fri, 21 Aug 2020 00:20:29 +0100
 

diff --git a/debian/control b/debian/control
index 6eb40a689ceb1251fa7a180309b07bf8310cfdd9..07e8f352bdaa431b0a450ea82cb17f11fb9be1d7 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -189,7 +189,7 @@ Depends:
  cpio,
  fuse,
  gir1.2-ostree-1.0,
- gjs [!s390x !sparc64],
+ gjs [!sparc64],
  gnupg,
  ostree,
  python3,

diff --git a/debian/ostree-tests.lintian-overrides b/debian/ostree-tests.lintian-overrides
index 2d3a94a9e3a6ec7bcf8f05a7736279b9396a3529..a2e022ebf7b8bfa67137d36200975b2ece80302b 100644 (file)
--- a/debian/ostree-tests.lintian-overrides
+++ b/debian/ostree-tests.lintian-overrides
@@ -6,11 +6,10 @@ ostree-tests: extra-license-file usr/libexec/installed-tests/libostree/gpg-verif
 # This is deliberate, working around the assumption of recursive make
 ostree-tests: symlink-is-self-recursive usr/libexec/installed-tests/libostree/tests .
 
-# gjs has been broken on sparc64 for a while, and is likely to be removed
-# from s390x because mozjs60 doesn't work there.
+# gjs has been broken on sparc64 for a while.
 # The test that runs this script is automatically skipped if gjs isn't
 # present.
-[s390x sparc64]: missing-dep-for-interpreter gjs => gjs (usr/libexec/installed-tests/libostree/corrupt-repo-ref.js)
+[sparc64]: missing-dep-for-interpreter gjs => gjs (usr/libexec/installed-tests/libostree/corrupt-repo-ref.js)
 
 # This shared object genuinely doesn't use any libc ABIs directly,
 # only via GLib